bitkeeper revision 1.1159.258.163 (429dd4a8sp6_fuyZOAS4879Pd7C9sw)
authorvh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>
Wed, 1 Jun 2005 15:30:48 +0000 (15:30 +0000)
committervh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>
Wed, 1 Jun 2005 15:30:48 +0000 (15:30 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/xen-2.0-testing.bk


Trivial merge